unref the model after the last use, not before.

Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
	model after the last use, not before.

diff --git a/ChangeLog b/ChangeLog
index 87fd763d2e7537b54b43654c00bb4b3c2f285916..f81301d8d407fefdea1aed72a5b825cd31909858 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
+       model after the last use, not before.
+
 Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.default gtk/Makefile.am: Install a Default

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 87fd763d2e7537b54b43654c00bb4b3c2f285916..f81301d8d407fefdea1aed72a5b825cd31909858 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
+       model after the last use, not before.
+
 Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.default gtk/Makefile.am: Install a Default

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 87fd763d2e7537b54b43654c00bb4b3c2f285916..f81301d8d407fefdea1aed72a5b825cd31909858 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
+       model after the last use, not before.
+
 Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.default gtk/Makefile.am: Install a Default

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 87fd763d2e7537b54b43654c00bb4b3c2f285916..f81301d8d407fefdea1aed72a5b825cd31909858 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
+       model after the last use, not before.
+
 Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.default gtk/Makefile.am: Install a Default

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 87fd763d2e7537b54b43654c00bb4b3c2f285916..f81301d8d407fefdea1aed72a5b825cd31909858 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
+       model after the last use, not before.
+
 Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.default gtk/Makefile.am: Install a Default

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 87fd763d2e7537b54b43654c00bb4b3c2f285916..f81301d8d407fefdea1aed72a5b825cd31909858 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
+       model after the last use, not before.
+
 Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.default gtk/Makefile.am: Install a Default

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 87fd763d2e7537b54b43654c00bb4b3c2f285916..f81301d8d407fefdea1aed72a5b825cd31909858 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
+       model after the last use, not before.
+
 Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.default gtk/Makefile.am: Install a Default

diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 627ebee287b1faaafa6b2653e7d318f8bbb57b6c..c8b858d389c7dfca279a0e61d99d86c08f4724fc 100644 (file)
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -1640,8 +1640,6 @@ gtk_tree_row_reference_free (GtkTreeRowReference *reference)
                         ROW_REF_DATA_STRING,
                         NULL);
     }
-  g_object_unref (reference->proxy);
-  g_object_unref (reference->model);
 
   if (reference->path)
     {
@@ -1649,6 +1647,8 @@ gtk_tree_row_reference_free (GtkTreeRowReference *reference)
       gtk_tree_path_free (reference->path);
     }
 
+  g_object_unref (reference->proxy);
+  g_object_unref (reference->model);
   g_free (reference);
 }